Should solve integer overflows in SAPT code #619
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Should prevent integer overflow. May not be exhaustive though.
dgasmith
approved these changes
Feb 15, 2017
susilehtola
reviewed
Feb 15, 2017
| @@ -620,7 +620,7 @@ void SAPT2::ijkl_to_ikjl(double *tARAR, int ilength, int jlength, int klength, | |||
|
|
|||
| for(int i=0; i<ilength; i++) { | |||
| for(int l=0; l<llength; l++) { | |||
| long int ijkl = i*jlength*klength*llength + l; | |||
| long int ijkl = (long int)i*jlength*klength*llength + l; | |||
There was a problem hiding this comment.
I might remember wrong, but don't you need to also cast jlength, klength and llength, since the order of evaluation isn't guaranteed...? What this is doing is typecasting i to long int, but jlengthklengthllength is still int and might overflow.
There was a problem hiding this comment.
Nevermind, the compiler should promote all of the operands to long int before the multiplication takes place.
susilehtola
reviewed
Feb 15, 2017
| @@ -240,7 +240,7 @@ void SAPT2p::r_ccd_prep(const char *TARBS, const char *ARBS, const char *CA_RBS, | |||
|
|
|||
| double **tARBS = block_matrix(occA*virA,occB*virB); //! | |||
|
|
|||
| C_DCOPY(occA*virA*occB*virB,&(vARBS[0][0]),1,&(tARBS[0][0]),1); | |||
| C_DCOPY((size_t)occA*virA*occB*virB,&(vARBS[0][0]),1,&(tARBS[0][0]),1); | |||
andysim
approved these changes
Feb 17, 2017
jturney
approved these changes
Feb 17, 2017
|
@jgonthier These are good changes regardless, so pulling them in now. If it turns out it didn't fix the problem we can always go back in later. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Substitute some int by size_t, and introduces (size_t) casts wherever multiplication of integers seemed problematic.
Todos
Questions
Status